Merge "Cleanup how we set back button alpha" into ub-launcher3-edmonton