Merge "Fix failing testOnPictureInPictureRequested" into rvc-dev