Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad