Merge "Reset the vertical progress when the discovery bounce is closed" into ub-launcher3-edmonton