LPS-48405 Refactor feedback UI (forward port)