Merge "Removing TextureUploadObserver from symbol table" into devel/master