Merge "Make AudioService aware of device orientation changes" into jb-dev