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