Merge "Initial changes to support full-width quickscrubbing." into ub-launcher3-edmonton