Merge "Making caret visibility part of state definition" into ub-launcher3-edmonton