Merge "Fix crashes in QS tuner" into mnc-dev