Merge "Reland Support incremental dev option OTA during signing" into main