Merge proposals dependent on lp://qastaging/~gesha/lava-dispatcher/refactor-enter-bootloader

1. refactor-enter-bootloader
2. Dependent merge proposals