Merge "Fix setInterfaceEnabled method signature" into main