Merge "Support7Demos: Update the MediaRouter demo" into mnc-ub-dev