Merge "Revert spinner caret size to 24x24dp" into mnc-dev