Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev