Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev