Merge "Add flagRemoved check back in BubbleExtractor" into rvc-dev