Merge "fix regression RecordingActivityMonitor"