Merge "Modify the contact picker for call forwarding to directly show contact list"