Merge "Merge "Freezing screen when dismiss pip if orientation is going to change." into qt-r1-dev am: 41b006d8 am: 366a6e99" into qt-qpr1-dev-plus-aosp