Merge "Add the priority person highlight back to bubbles badge" into sc-dev