Merge "Add ThemedSpinnerAdapter.Helper class" into mnc-dev