OP-1222 Finished re-factoring vehicle selection pages,
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard
OP-1222 Fixed a merge regression.
OP-1222 Minor ordering adjustments.