Merge "Migrate some preference page" into main