Merge "Gets rid of dividers in sound settings" into pi-dev