Merge "Change inverse HT function argument from TXFM_2D_CFG* to int" into nextgenv2