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

Change-Id: Ibe9a565a4a69b05a58cca480c7feec4094a4cdda