Merge "Fix session race due to pending user-switch task" into rvc-dev