Merge "Fix abnormal flicking when swiping up to exit OHM"