Merge "Fix bug 3389707 - Spinner: should be able to expand wider than their collapsed size"