Merge "add settings for dock audio enabled" into jb-mr1-dev