Merge "Don't lock device when double tapping" into nyc-dev