Merge remote-tracking branch 'tizen_2.2' into tizen