Merge "Code cleanup" into ub-launcher3-burnaby