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

Change-Id: I00b769b3bce0ca6851001a84f4c53c16f5094c6c