Merge "Sync code with tizen 2.4" into tizen