Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am: 004e01d3" into pi-dev-plus-aosp