Merge "Improve texture border color handling."