Merge "Fix the option to set a different screen lock in the "Set a PIN" screen...

Merge "Fix the option to set a different screen lock in the "Set a PIN" screen is displayed off the screen when the device language is set to Arabic" into main