Merge "Fix constantly spinning hvac views"