Merge "Remove mask internally in texture manager" into devel/master