Merge "Prevent thumbnails from shifting if placeholder view doesn't overlap" into sc-dev