Merge "Fix NPE when Spinner is reused."