Merge "Fix restore of view and text wrap scales." into ics-mr1