Merge "Use SystemUIDialog.setWindowOnTop to make user-switching dialogs not steal focus"