Merge "Split texture-manager-impl files" into devel/master