Merge "Skip unlock requests for users who aren't running." into nyc-dev