Merge: from serverprofiler_disable_memstates - Update: added extra safety try-finally Tests: none, trivial change