Merge "Refactor how app pair icons draw" into 24D1-dev