Merge changes from topic "mediarouter_fix"

* changes:
  AudioPlayerStateMonitor: fix NPE
  Revert "Revert "Fix overactive media routing""