Merge "Fix test when home controls hsum flag enabled" into main