Merge "Move changeScene calls to the application scope" into main