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

* commit 'ade26e2e383cd0041f8aa94467d119c2bd1ee5e8':
  Fix restore of view and text wrap scales.