Merge "Ignore any error when killing our process" into ub-launcher3-master