Merge "Fixed a clicking bug on the lockscreen" into nyc-dev