Merge "Fix NAN temp on system bar HVAC controls"