Merge rsa/tizen_2.2 into rsa/master