Merge "Handle app pair divider bar rotation"