Merge "Exit desktop-immersive when app unrequests immersive" into main