Merge "Gracefully handle drawing caches allocation failure. Bug #3431451"