Merge "Reduce vibration length of camera gesture" into nyc-mr1-dev