Fix most of the height bug by adding calculateHeight to Swiper
Merge in master