Merge "Account for early display rotation for gestures with shell transitions"