Merge "Store cropHints in preference (1/2)" into main