Merge "Show progress user unlocking is delayed" into nyc-mr1-dev