Merge "Removing obsolete resources" into ub-launcher3-burnaby