Merge "No more waiting around for resume" into ub-launcher3-master