Bug 983885: Aggressively cleanup img/canvas in contacts.
Merge pull request #17535 from wanderview/contacts-canvas-cleanup-2

Bug 983885: Aggressively cleanup img/canvas in contacts. r=jmcf