Merge "Defer jumping to NORMAL state if overview is still peeking" into ub-launcher3-qt-r1-dev