Merge "Reduce PiP flickering when switch apps with orientation change" into udc-dev