Merge "Updating icon badging logic"