Update all qa-util-* includes
Fix bug overriding selected menu items