Merge "Revert "Add SPEAKER_CLEANUP system usage"" into main