Merge "Abort swipe up gesture when long press is detected" into mnc-dev