Merge "Fix deadlock when create alert window notification" into oc-dev