Fix intent switching using Change-UI
Merge pull request #6777 from GinjaNinja32/uifix

Fix intent switching using Change-UI