Merge "Only restart media.tuner when it's running" into main