Merge change 5680 into donut

* changes:
  Fixes #1949502. Prevents an NPE in View.buildDrawingCache().