Merge "Use vibration id as callback reference in VibratorService"