Merge "Migrate to TwoStatePreference" into main