Merge "Updating logic to check if icon needs badging"