Merge "For archived apps, reset icon span as soon as BubbleTextView starts unarchiving" into main