Merge "Attach PipSnapshotContentOverlay in PipTransition" into udc-dev