Merge "Refactor transform type-size search function" into nextgenv2