Merge "Fix WeakHandleBase::Reset()" into devel/master