Merge pull request #21831 from sergi/blank_screen

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