Fix intent switching using Change-UI

Fixes #6629, probably #6693 too.