Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte