Merge "Include app badge without markings in bubble data"