Merge "Cleanup history perf + UI"