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: f9eacfff am: 34fe9e08 am: 319a31de
Change-Id: I478382986c7f8e5e1c15ae8f96c9844413f3c4d7