Merge "Change default units to be consistent in tm-qpr-dev/DefaultConfig.h" into tm-qpr-dev