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
Change-Id: Id91fac3e435586684ae3444bf51ccf180e1deed5