Merge "Settings UI fix for missing secure lock screen feature."