Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev am: 41b006d8d6
am: 669b8963f6

Change-Id: I7e2222f3c936aa858f606ff0a2abe78d9a4c4448