MapsSearchTableViewController with SearchDisplayViewController.
Merge remote-tracking branch 'origin/Maps' into Maps