Merge "Update handling of vibration effects that don't need cropping" into main