Merge "Enlarge touch target size on settings spinner" into qt-dev