Merge "logcat: continue where we left off"