Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev