Merge "Ringbuffer stops logging after wifi toggle"