Merge changes I14e03939,I9aafe6f2

* changes:
  Fix an issue where Surface::lock() would never update the output region
  Add a debug option to turn the "transformation hint" off