Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"