Merge "Fix 4518876: Disable lock screen rotation on phones."