Merge "Use a spinner for the folder selector." into honeycomb