Merge "Handle the AM error dialogs in system UI thread" into sc-dev