[Minor] Typo fixed
gracefully handle the absence of the debug.stopwatch service
Move all settings resolving to the BlockContextManager
cosmetics