Merge "refactor reset_skip_txfm_size and elimate a lot of code"