Merge "Improved vibration feedback completely" into nyc-mr1-dev