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