Merge "Fixed the usage of the menu key to unlock" into nyc-dev