Merge "Set minimum scaled width/height to 1"