Merge "Fix deadlock during user state transitions" into nyc-dev