Merge "Stop non-touchable regions affecting magnification" into nyc-dev am: 352ea1e
am: 8142d96

* commit '8142d9691c77c7d9049a4708d6055cc31a337a9a':
  Stop non-touchable regions affecting magnification

Change-Id: Ic623379984f58c9418f88fcc1519d86da5c2544d