Merge "Fix build error dlog string" into tizen