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

Change-Id: I3ce24c0108dd5bea9437deea2848e6c592ccd33e