Merge "Destroy drawing cache when switching layer type" into nyc-dev