Merge "BUG-4085: Li: support flowRemoved notifications when SM is off"