Patch to synchronize with bug fixes done in Tizen 2.4 MCD branch.