Bug 1038815 - Contacts can get into a 'frozen' state in some cases r=francisco