Merge "Update app pair icon colors when switching containers" into main