Merge "Only re-register callbacks if tuning changed" into mnc-dev