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

* commit '352ea1e307fd33b999ad52a271547271d20802d0':
  Stop non-touchable regions affecting magnification

Change-Id: Ia61101d7c0cc3e1ed7b462f631dbf63ce28da185