Merge "Fix regression on VibratorService update settings callback"