am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route...
am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '8f695c52':
Make MediaRouter UI more robust around route count changes