Merge "Increase timeout waiting for ExternalStorageService to bind." into rvc-dev