Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev