Merge "Fixing issue where PIP did not stay minimized after rotation."