Merge changes I86df6f9f,I0c0c3ac9

* changes:
  Revert "Reset app routes when global a2dp state changed"
  Revert "Call route selected/unselected callbacks"