Merge "Update fix to restore view and text wrap scales." into ics-mr1