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