Merge "Allow upcoming vibration when current one if being cancelled" into tm-qpr-dev