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

* commit '549a822331a522cabfb854b91b1cad5a0f7128ae':
  Fixed a bug where the positioning on the lockscreen was wrong

Change-Id: Iee0e3b108b1345c65d53a9d02a68e5f5c1f44de5