Merge "Removing extra binder call on state or visibility change" into ub-launcher3-edmonton