Merge "Added flags for flow removed event"