Merge "Fixing potantial context leak code path" into ub-launcher3-calgary