Merge "Fix text styling for choose pattern/password screens" into sc-dev