Merge "Add integration test for stylus buttons surrounding hover gesture"