Merge "Fix flaky VibrationSettingsTest" into main