Merge "Fix 3191824: Fix lockscreen portrait mode for xlarge devices"