Merge "Fix tuner crash from dependencies"