Auto-select add modal based on stream
Auto-select add modal based on stream

[ Fixes Delivers #88474650 ] Changes `active` condition from `watch` to
`app.watch` to match change in nested views.

OKNoah/slipstream,OKNoah/slipstream