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

Change-Id: Ide6dd7f95f7e4d799c07463ac455fc8140719423