Merge "fix dock audio enable dialog" into jb-mr1.1-dev