Revisit the way the new popup contracts and expands

[jspenguin2017]

I don't want it to contract and expand 6 times, but it does make sense for some of the buttons to be hidden by default.

Probably 3 different states:

• Top toolbar and firewall panel both hidden
• Top toolbar shown but firewall panel hidden
• Top toolbar and firewall panel both shown

[jspenguin2017]

Or maybe we can simply change the default value of popupPanelLockedSections, that's probably a lot simpler than the current patch that completely change the contract and expand logic.

The arrows on the More and Less buttons can probably be restored too.

Also don't forget to add settings migration.