Merge "When destroying a surface, only unmake current if necessary Bug #9404946"