Merge "Use the same name for PipContentOverlay variants" into tm-qpr-dev