Merge "Fix display id for desktop keyboard shotcuts" into main