Merge "Update PipContentOverlay usage" into main