Merge "Extract SystemUIDialog.Delegate into DialogDelegate and make it generic" into main