Merge "Rename affine transformation configuration change to be consistent."