Merge "Improve initial unlock delay (1/2)" into nyc-mr1-dev