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