Merge "Choose a matching record in split-screen stack" into pi-dev am: 2d66433998
am: dc2185c7e0

Change-Id: I07ecea3d03ea3834658e9d1eccec3dff5dd60a6a