Apply tilematrix set fix to release branch

This is the PR for the release branch.