Merge "Work around for display info mismatch during the PiP transition" into...
Merge "Work around for display info mismatch during the PiP transition" into rvc-dev am: dbb9d141 am: 013a422e am: 3cbecf7a am: 8dc67981
Change-Id: I85f81a7e52e044c368bca9ab97c90626f6e5b0da