Merge "Restoring 10-sec wait for model initialization" into ub-launcher3-master