Merge "Fine tune scroll behavior after model update" into qt-dev