Sync code with Tizen 3.0 branch