Merge "Clean up after VibratorManager feature introduced" into sc-dev