[Tizen 3.0] 2.4 source code merge