Merge "Integrate custom close action in ApiDemos for PiP" into tm-dev