Merge "LeanbackDemo: Support Picture-in-picture"