Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev