Merge "Some launcher3 fixes so that it compiles with different configurations" into ub-launcher3-edmonton