Merge "Fixes switch-user -w command." into rvc-dev