Merge changes I96cf4d06,Ic706c0d1

* changes:
  WM: Change Z-Order of internal TYPE_SYSTEM_ALERT windows to be higher than TYPE_APPLICATION_OVERLAY
  Revert "WM: Switch to using APPLICATION_OVERLAY window type for ErrorDialogs"