Merge "Refactoring TextureUploadObserver." into devel/master