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