Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a822331
am: ea2e5bfdd2

* commit 'ea2e5bfdd2f2d288e907131dad4de8376da46133':

Change-Id: I7137df96cb24951f187a7ef19921990bf47963dd