Merge "'Allow sound' = let the app decide" into oc-dev