Merge "Fix touching gear on lock screen" into nyc-dev