Merge "Change how "small view updates" are calculated." into main