Merge branch '6029-Increase_connectTimeout' into 'epic23-update_with_upstream'

            OkHttpClient.Builder()

                // Set timeouts. According to [AbstractThreadedSyncAdapter], when there is no network

                // traffic within a minute, a sync will be cancelled.

                .connectTimeout(15, TimeUnit.SECONDS)

                .connectTimeout(60, TimeUnit.SECONDS)

                .writeTimeout(30, TimeUnit.SECONDS)

                .readTimeout(120, TimeUnit.SECONDS)

                .pingInterval(