Merge "Remove options to collect individual IME traces" into main