Merge "Refactoring common methods" into ub-launcher3-burnaby