Merge "Moving some methods from various activities to the base interface" into ub-launcher3-master