Merge "Settle auto PiP transaction in WindowContainerTransaction" into sc-dev