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: 11112619 am: 90d6f56d
Change-Id: Ib455f7462398e676d6d497b0ed47367a941c37e0