Merge "Changing the state UI logic for normal build and quickStep build" into ub-launcher3-master