Merge "Flow control for DataControl" into tizen_2.1