Merge "[datacontrol] Fix synchronisation issue" into tizen