Merge "Do not hide lock screen settings conditionally"