Merge "Set mask shader after matrix is set" into tm-dev