Merge "fix AppControl E_MAX_EXCEEDED result" into tizen_2.1