Merge "Rename CombinedVibrationEffect to CombinedVibration" into sc-dev