Merge "Made app launch timeout configurable and defaults to 30 seconds." am: 5e44e6ef am: 3cb1bdcc am: 87cfe7b4 Change-Id: I80f15fff18370a659730585f716d77ec83fc076f