Merge "Move RestrictedModes to separate file" into main