Merge "fix(build): remove duplicated include order" into integration