Merge "Increase timeout on VibrationThread to wait for vibrator callbacks" into sc-dev