Merge "Fix ActionDisabledByAdminDialogHelperTest"