Merge \"Fixing potantial context leak code path\" into ub-launcher3-calgary
am: 8e6a800480

Change-Id: I13661a761cc4294e2a3e498532a926502f56b730