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