Summary: Depends on D3740.

Test Plan: existing, we also need to manually test this with the corresponding ui changes

Reviewers: #engineering, zasgar, michelle

Reviewed By: #engineering, michelle

JIRA Issues: PL-1553

Differential Revision: https://phab.corp.pixielabs.ai/D3770

GitOrigin-RevId: 599e33bacd9cef0786c3d5795a91849179cec4c3