Merge "Fix 4686480: Cleanup LockScreen settings"