Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev