Merge "Merge mSwipePipToHomeOverlay with mPipOverlay and remove unused code" into main