spinner: Merge upstream code into tizen_3.0