Merge "Choose a matching record in split-screen stack" into pi-dev