Merge "Work around for display info mismatch during the PiP transition" into rvc-dev