Merge "Fit adst/dct's stage range into 32-bit in bd12" into nextgenv2