Merge "Making methods in PaackageManagerHelper non-static" into ub-launcher3-master