Code sync from tizen 2.4 branch