Merge "Transition out of split screen when triggering enter desktop." into main