[NUI] Manual merge from tizen50 (#653)