Merge "WM: Switch to using APPLICATION_OVERLAY window type for ErrorDialogs"