Bug 897409. Use a temporary surface instead of forcing image surfaces. r=mattwoodrow
Bug 897839. Add some null checks for the compositor map. r=mattwoodrow