Merge "Revert^2 "Fix getHalVersion overriding UNSUPPORTED version"" into main