Merge commit 'f5107ee3f24a28174ba13eee2b731a5be5c28fc0' * commit 'f5107ee3f24a28174ba13eee2b731a5be5c28fc0': Tweak LockScreen to make use of landscape layout.