Merge from tizen_2.1 into tizen_2.2