Merge "Increase the timeout for logcat logs collection for dropbox" into main