Merge "Fix LockScreen Settings on phones."