Merge "Skip resize changing transition if display is rotating" into sc-v2-dev