Merge "Add logic to start FACTORY_RESET only after REBOOT completed"