Merge "Avoid changing scenes if already on the desired scene" into main