Merge "Don't convert all sounds to vibrations in vibrate mode" into oc-mr1-dev