Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-dev