Merge pull request #17535 from wanderview/contacts-canvas-cleanup-2

Bug 983885: Aggressively cleanup img/canvas in contacts. r=jmcf
Merge pull request #17320 from crdlc/bug-985132

Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt whe...