Merge "Update Hvac to remove the self register or ui components with their controller"