Merge "Ensure we still build the hw layers when pulling up all apps." into ub-launcher3-calgary