Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev