am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev

* commit '95cf8c1121a95750358ee99169c96d8d4dfb4950':
  Allow ungrouping media routes when a group is the only alternate route