Merge "Fixed assert because comparing the float and int." into tizen_2.1