Merge "Remove "Add users from lock screen" from secondary users"