Merge "Remove unnecessary note fanout when removing notes"