Merge "Clean up flag override mechanisms for vibrator tests" into main