Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev