Merge commit 'ee09f4ad02d04066e2ded84471e1940e91d458c8' * commit 'ee09f4ad02d04066e2ded84471e1940e91d458c8': Fix case where the lock screen information won't fit on screen.
Merge commit 'ee09f4ad02d04066e2ded84471e1940e91d458c8' * commit 'ee09f4ad02d04066e2ded84471e1940e91d458c8': Fix case where the lock screen information won't fit on screen.