Merge "Make ContactSelectionActivity useable"