Merge "Fixed PIN entry detecting gravity improperly" into nyc-dev