Merge "Merge "Merge "Enlarge touch target size on settings spinner" into qt-dev am: 87dbdeab" into qt-dev-plus-aosp am: 3ce6bd3b"