Merge commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9' * commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9': Fix for 2161835: Tweaks to rotary lock screen:
Merge commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9' * commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9': Fix for 2161835: Tweaks to rotary lock screen: