Merge "Fixed notifyUnsafeOperationStateChanged." into sc-dev