Merge "Update the PiP ActivityRecord with new PiP params" into main