Merge "Ensuring that badge override is respected even if component name is set on the Shortcut" into udc-dev