Code sync: merged tizen 2.4 base source code