Merge "Fine tune scroll behavior after model update" into qt-dev
am: 140b59f464

Change-Id: I2a0a3efecc6611a1f479b46888c30999512201b7