Merge "[-1] Fix flicker of -1 when swipe up to exit -1 isn't fast enough" into main