Fix bug where occasionaly the delete row button did not work
update staging.yaml

[ci skip]
simplify expression
Merge pull request #4742 from dimagi/one-report-to-rule-them-all

simplify expression
Add choices to the Edit Custom Data Fields UI
add choices to edit UI
pep8
Add choices validation to upload validator
Fix template
update staging.yaml

[ci skip]
Merge remote-tracking branch 'origin/ptop-reindex' into autostaging
Merge remote-tracking branch 'origin/historical-forms' into autostaging
Merge remote-tracking branch 'origin/remove-hutch' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge remote-tracking branch 'origin/revert-4574-revert-4553-case-list-redesign' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging
Merge remote-tracking branch 'origin/masterlist-workflow' into autostaging
Merge remote-tracking branch 'origin/graphing+double-management' into autostaging
Merge remote-tracking branch 'origin/double-management+case-detail-tabs2' into autostaging
Merge remote-tracking branch 'origin/double-management' into autostaging