Merge "Fix force L3 preference unit test" into main