Merge "Build fix" into ub-launcher3-burnaby