Merge "Fix tuner-related crashes"