Merge "Code cleanup: remove some unnecessary methods/variables" into ub-launcher3-master