Merge "Optimize how AudioService receives media button events" into jb-dev