Merge "Reload state when user unlocks" into nyc-mr1-dev