Merge "Add a guard on UserController to avoid user switches when not ready." into rvc-dev