Merge "Make MediaRouter UI more robust around route count changes" into jb-dev