Merge "Consolidate app-pair divider bar behavior" into sc-v2-dev