Merge "Initial changes for full-width quickscrub." into pi-dev