Merge "[DO NOT MERGE] Handle landscape and portrait display for PIP rotation"