Merge "Fix RecordThread running too often if fast capture is active"