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

* commit 'c99a1107c0d4fdf47595e5072192d647a01e13b3':
  add settings for dock audio enabled