Merge "Print OTA merge progress state in logs"