Merge "Cleanup attention helper refactor flag" into main