Merge "Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode"