Merge "Support7Demos: media router sample" into jb-mr2-ub-dev