[Merged by Bors] - Improve performance of proposal builder by not DB inserting active set if not necessary

[Merged by Bors] - Improve performance of proposal builder by not DB inserting active set if not necessary #21249