Merge "Fix deadlock when create alert window notification" into oc-dev
am: 678477b383

Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215