Merge "Improve time to texture destruction" into oc-dev am: 1bc0286ef8
am: 9d08fca62f

Change-Id: Iee16d786983734d138a408707cf5efd9f9c9b9fb