Merge "API updates for MediaRouter" into jb-dev