Merge "Don't recompute display mode during a mode switch" into sc-dev