Merge "Remove extra handler#post inside setIncludeTestInterfaces" into main