Merge "Always account for divider height when calculating list height" into nyc-dev