Merge "Work around for display info mismatch during the PiP transition" into rvc-dev am: dbb9d141 am: 013a422e Change-Id: I9cf75c0e6fadc0aa78746e56e40016c9e403d401