Merge "Change user setup prompt dialog showing logic" into rvc-dev