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

Change-Id: I48aadf1444ce14bbff67894fdb0a6fdf1dbb2ecf