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

* commit '6b6a0e7773f1f55a04c91d8acb320ffe9de710f6':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: Id1561c532f2049cae908b1a0d06b6f67c8ab02b9