Merge "Support abnormal restart on setting" into tizen_2.2