Merge "Check preferred display for matching existing activity"