* commit 'e695bddefa9a8121e661d2c87ffe0585088a2ebf': Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]
* commit 'e695bddefa9a8121e661d2c87ffe0585088a2ebf': Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]