Merge "fixed bug(N_SE-46042, N_SE-46098)" into tizen_2.2