Merge "Fix saving target fragment when Fragment not yet created." into oc-dev