am b7ce28c: Merge change 962 into donut

Merge commit 'b7ce28c64cc2f7250b02021f8a4cd3874155bee8'

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