Merge "Fix 3024522: Add new "Off" setting to LockScreen options."