Merge "Disable grant admin option on adding users from lock screen"