Merge "Migrate test to TwoStatePreference" into main