Merge changes I4c337195,Id3e95dd9,I3b85ea4d into main

* changes:
  Use the bubble type to determine if the app badge is shown
  Use the type not the null check to identify a shortcut bubble
  Introduce bubble types & clean up some naming