Merge "Changes to VibrationThread in preparation for sessions" into main