Merge "Rename CombinedVibrationEffectTest to CombinedVibrationTest" into sc-dev