Merge "Fix Activity leak from ContentCapture Context-Updated event."