Merge "Fix skip_txfm issue in rdopt code"