Merge "Remove workaround for starting app" into ub-launcher3-master