Merge "Remove custom focus logic" into ub-launcher3-edmonton