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

* commit '69957172fa8336e01a9ff07ab34deca2c553f0b4':
  Update fix to restore view and text wrap scales.
tree: efd4d1bad284b1432f9cf7aea7b319c50e65c797
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE