Merge "don't re-apply the class-adding transforms" into jb-ub-mail-ur9