Merge "Updating assets" into ub-launcher3-burnaby