Merge "Revert "Bunlde ClientTransactionItems when enter/exit PiP"" into main