VE-169 Fully remove focus widget when tearing down the surface