Merge "Clamp initial scale between minimum and maximum values." into ics-mr1