Merge "Use the right method to get the component state" into main