Merge "Merge "Allow Launcher to use PipContentOverlay" into tm-qpr-dev am: 98ef7be762 am: e75e50f298"