Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev