Merge "Prevent Media notification spam from spiking SystemUI memory use" into main