Merge "Use `timeout -i` to distinguish cases where logcat is making progress."