Merge "Go back to previous state when hitting back from discovery bounce" into ub-launcher3-edmonton