am ee698a01: Merge "Free up resources by deleting shaders early on"

* commit 'ee698a01bdc9ea7aa2b1cd729109b194a130f9f5':
  Free up resources by deleting shaders early on