Merge "Add divider view support for app-pairs"