Merge "storaged:Thread out of sync will cause null pointer crash"