Merge "Migrate Android version preference" into main