Merge "Add test ForceL3FallbackPreferenceControllerTest" into main