Merge "Migrate ENABLE_CURSOR_HOVER_STATES to aconfig" into main