Merge "Add demo for content PiP"