Bind controls edit and add flows

It's possible to navigate from editing controls to adding new ones and
back when the flag is active. This affects both setting up a new app and
amending an existing one.

Protected by Flags.CONTROLS_MANAGEMENT_NEW_FLOWS

Test: Manual + added autotests
Fixes: 265180342
Change-Id: I471e7581982453e126f515272b7199a40e257643