Merge "Increasing wait time for loading model to 60s" into ub-launcher3-master