Merge "Extract VibratorInfo aggregation logic to a factory" into main