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 am: bbffdeb1
Change-Id: Id832b141bfd2a3763c47d4452a4a6158812a260e