Merge "Workaround for an activity leak" into ub-launcher3-rvc-dev