Merge "Fix deadlock when create alert window notification" into oc-dev am: 678477b3 am: 59cd5a98 am: 3692e739 Change-Id: I73608ceef0c56bf08eff107fe0186c581dcadd0d