Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep' into...

bootloader: Blocking the Factory reset during wake up from deep sleep

Closes IDFGH-1536

See merge request espressif/esp-idf!5673

diff --cc components/bootloader/subproject/main/bootloader_start.c
Simple merge