Merge "Consider shell transition to update display mode"