Merge "Fix some issues with shelf jumping/duration" into ub-launcher3-qt-dev am: 9e26fccacc
am: 136cbc54bb

Change-Id: I002029f2d31bf0c921ddbcc807e294f44d982c9d