Merge "Fix race when rotating the display during an entry into PIP" into sc-dev