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