Merge "Add divider bg placeholder to app pair icon launch" into main