am e8966e12: Merge change 4008 into donut

Merge commit 'e8966e126388223de119c909d572fb8d1406a3ac'

* commit 'e8966e126388223de119c909d572fb8d1406a3ac':
  Fixes #1886237. Views drawing cache was not generated properly.