[overlay-scrollbar] Cleanup and rebuild