Merge "Fixed stopped countdown when PIN entered incorrect." into nyc-dev