Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev