Merge "Fixing activity leak on config change" into ub-launcher3-master