Merge "Nabi issue-N_SE-45136 fix" into tizen_2.2