Merge "Fix switch statement in 8x8 transform"