Merge "Exit desktop immersive if applicable on other transitions" into main