Merge "Reapply back button alpha at end of state animation" into ub-launcher3-edmonton