Merge change 962 into donut

* changes:
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.