Merge "Fix the expander regression with async inflation" into main