Merge "Consolidate PiP demos in ApiDemos app"