Promise.timeout() doesn't stack (i.e. foo.timeout(1000).timeout(1000) doesn't mean "wait 1000ms, then another 1000ms", it means that we have two 1000ms timeouts running at the same time). Fix places where it could be a problem.

lib/roles/device/plugins/install.js

@@ -101,8 +101,8 @@ module.exports = syrup.serial()
               )
               sendProgress('installing_app', guesstimate)
             })
+            .timeout(30000)
         })
-        .timeout(30000)
         .then(function() {
           if (message.launchActivity) {
             log.info(
@@ -113,9 +113,9 @@ module.exports = syrup.serial()
             // Progress 90%
             sendProgress('launching_app', 90)
             return adb.startActivity(options.serial, message.launchActivity)
+              .timeout(15000)
           }
         })
-        .timeout(15000)
         .then(function() {
           push.send([
             channel