Merge "Fix abnormal flicking when swiping up to exit OHM in 3-button mode"