Merge "Allow specify theme for catalyst test" into main