Merge "Ensure we enter spitscreen based on requested rotation" into main