Merge "Add pinch classification and scale factor axis"