Merge "Fix incorrect placement of HUN icon in statusbar" into main