Merge "Update badge visibility on expand and collapse" into sc-dev