Merge "Clean up for ENV_OUTSIDE_TEMPERATURE" into pi-dev