Merge "Add a flag to enable HSUM features in desktop mode." into main