Merge "Work around for display info mismatch during the PiP transition" into rvc-dev am: dbb9d1412b am: f9eacfff57 am: 34fe9e085b
Change-Id: I8ce8ea69f6d673bacc552aeba8ad1cfaa661ff19
This commit is contained in: