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

Change-Id: Ia310ffbe1f39902d2be371fb9467e72cf87002ee