Merge "Respect "Don't add users on lock screen" regardless of lockscreeen secure state." into sc-dev