Merge "Moving some files and methods around" into ub-launcher3-master