Merge changes from topic 'TunerLoc' into mnc-dev

* changes:
  Add metrics to tuner
  Move tuner enable point to QS