Merge "Add fail-safe code for key migration" into tizen_4.0