Backport @framework/ui to v15

Brings the ui/ directory on v15 level with v16 hotfix, so the framework UI matches across lines.