Merge "dump callstack on Surface use error"