Contacts Update CM-10.1 M3

These commits bring the Contacts app back up to date with the CM-10.1 M3 build status.

Successfully built and tested with no issues, if somebody else can please test to confirm there are no issues.