Merge "Remove duplicates from sound settings" into oc-dev