Merge "Fix 5044158: Fix lockscreen layout issues"