Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen