Merge change 4008 into donut

* changes:
  Fixes #1886237. Views drawing cache was not generated properly.