Merge "TEST_MAPPING: re-enable ScanningSettingsTest in presubmit" into main