OZP-708: Fix Intent updates. Handle required widgets.