Merge "Fix NPE when entering PIP from different orientation"