Merge "Fixed a bug where the positioning on the lockscreen was wrong" into...
Merge "Fixed a bug where the positioning on the lockscreen was wrong" into nyc-dev am: 549a8223 am: 6b6a0e77
am: 0b622288
* commit '0b622288':
Fixed a bug where the positioning on the lockscreen was wrong
Change-Id: I3947de939098a30dd2230e2ff755c3f12acf81dd