Merge "Remove tuner from development settings" into mnc-dev