Merge "Remove skip_txfm optimization." into nextgenv2